Skip to content

Conversation

@aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origin/feature/sdkv3
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/sdkv3

Hweinstock and others added 3 commits February 14, 2025 14:12
## Problem
The two streaming clients committed to the repo are generated via
different versions of `smithy-typescript-codegen`. Each version of
codegen pins the generated client to use specific versions of
`@aws-sdk/*` and `@smithy/*` packages. The root project also consumes
different versions of these packages. Therefore, the project is
currently consuming three different versions of many `@aws-sdk/*` and
`@smithy/*` packages.

This is problematic because it can cause dependency conflicts. Certain
versions of `@aws-sdk/*` and `@smithy/*` packages are only compatible
with certain other versions. For more information on this, see the
discussion involving help from an SDK team member explaining this
problem.

## Solution
- Regenerate both clients with the same version of codegen `0.25.x`. 
- Pin all necessary versions to ensure a single version of `@aws-sdk/*`
and `@smithy/*` packages.
- Add documentation to the build instructions that these clients must
stay in-sync (in terms of codegen).
- Add documentation regarding updating `@aws-sdk/*` packages. 

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
…6583

## Problem
Users have to re-select a debug config every time when open the Invoke
and Debug webview

## Solution
Automatically load the first matching debug configuration when the local
invoke view is opened
Update the src.gen dependencies of Amazon Q using new API models.
@github-actions
Copy link

  • This pull request modifies code in src/* but no tests were added/updated.
    • Confirm whether tests should be added or ensure the PR description explains why tests are not required.

chungjac and others added 2 commits February 17, 2025 14:01
## Problem
1. The /test command can occasionally create test files in directories
unrelated to the source file location (this is a known science issue
that will be addressed)
2. Unit tests generated after the "Clicks on accept" test may possibly
accumulate in the CI since testFixtures isn't reset for each build. This
can lead to bloated test environments as these tests should be isolated
and start with a clean state.

## Solution
1. Add a dedicated testgen folder within testFixtures to isolate from
other files. This prevents cross-contamination (ex: python tests
appearing in java directories)
2. Clean up generated unit tests after "Clicks on accept" test
---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
…q_utgGenerateTests event (#6598)

## Problem
- IDE does not emit requestId if it fails at `uploadArtifactToS3` in
`/test`

## Solution
- Added requestId for Test Generation without impacting the `/review`
- `requestId` is stored in /test session and emits if something fails in
the test generation workflow.
- Helps in debugging the root cause for the
`UploadTestArtifactToS3Error: "PUT" request failed with code "403"`
error in RTS logs.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner February 17, 2025 23:01
@Hweinstock Hweinstock merged commit e2fa6d7 into feature/sdkv3 Feb 18, 2025
24 of 26 checks passed
@Hweinstock Hweinstock deleted the autoMerge/feature/sdkv3 branch February 18, 2025 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants